Bump pg from 1.5.5 to 1.5.6 #600
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?s=60&v=4){kind=small}
Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.5 to 1.5.6. - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md) - [Commits](ged/ruby-pg@v1.5.5...v1.5.6) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
gem compare pg 1.5.5 1.5.6Compared versions: ["1.5.5", "1.5.6"]
DIFFERENT cert_chain:
1.5.5: ["-----BEGIN CERTIFICATE-----\nMIIDLjCCAhagAwIBAgIBCzANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p\nczEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe\nFw0yMzA0MjgwOTI0NDhaFw0yNDA0MjcwOTI0NDhaMD0xDjAMBgNVBAMMBWthbmlz\nMRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB\nIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6\nHGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW\n9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn\nlJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn\nQ53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT\nL7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID\nAQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe\nx17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBACAxNXwfMGG7paZjnG/c\nsmdi/ocW2GmCNtILaSzDZqlD5LoA68MiO7u5vwWyBaDJ6giUB330VJoGRbWMxvxN\nJU6Bnwa4yYp9YtF91wYIi7FXwIrCPKd9bk3bf4M5wECdsv+zvVceq2zRXqD7fci8\n1LRG8ort/f4TgaT7B4aNwOaabA2UT6u0FGeglqxLkhir86MY3QQyBfJZUoTKWGkz\nS9a7GXsYpe+8HMOaE4+SZp8SORKPgATND5m/4VdzuO59VXjE5UP7QpXigbxAt7H7\nciK5Du2ZDhowmWzZwNzR7VvVmfAK6RQJlRB03VkkQRWGld5yApOrYDne6WbD8kE0\nuM8=\n-----END CERTIFICATE-----\n"]
1.5.6: ["-----BEGIN CERTIFICATE-----\nMIIEBDCCAmygAwIBAgIBAzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz\nL0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNDAyMjgxOTMxNDdaFw0yNTAy\nMjcxOTMxNDdaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD\nPWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/\nmZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN\neSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/\n8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e\nSDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe\nJMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd\neJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5\nchQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg\n9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG\nA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR\n7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEArBmHSfnUyNWf3R1Fx0mMHloWGdcKn2D2\nBsqTApXU2nADiyppIqRq4b9e7hw342uzadSLkoQcEFOxThLRhAcijoWfQVBcsbV/\nZsCY1qlUTIJuSWxaSyS4efUX+N4eMNyPM9oW/sphlWFo0DgI34Y9WB6HDzH+O71y\nR7PARke3f4kYnRJf5yRQLPDrH9UYt9KlBQm6l7XMtr5EMnQt0EfcmZEi9H4t/vS2\nhaxvpFMdAKo4H46GBYNO96r6b74t++vgQSBTg/AFVwvRZwNSrPPcBfb4xxeEAhRR\nx+LU7feIH7lZ//3buiyD03gLAEtHXai0Y+/VfuWIpwYJAl2BO/tU7FS/dtbJq9oc\ndI36Yyzy+BrCM0WT4oCsagePNb97FaNhl4F6sM5JEPT0ZPxRx0i3G4TNNIYziVos\n5wFER6XhvvLDFAMh/jMg+s7Wd5SbSHgHNSUaUGVtdWkVPOer6oF0aLdZUR3CETkn\n5nWXZma/BUd3YgYA/Xumc6QQqIS4p7mr\n-----END CERTIFICATE-----\n"]
DIFFERENT date:
1.5.5: 2024-02-15 00:00:00 UTC
1.5.6: 2024-03-01 00:00:00 UTC
DIFFERENT require_paths:
1.5.5: ["/opt/hostedtoolcache/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/extensions/x86_64-linux/3.2.0/pg-1.5.5", "lib"]
1.5.6: ["/opt/hostedtoolcache/Ruby/3.2.3/x64/lib/ruby/gems/3.2.0/extensions/x86_64-linux/3.2.0/pg-1.5.6", "lib"]
DIFFERENT version:
1.5.5: 1.5.5
1.5.6: 1.5.6
DIFFERENT files:
1.5.5->1.5.6:
* Added:
certs/larskanis-2024.pem +24/-0
* Changed:
Gemfile +3/-0
History.md +8/-0
ext/pg_connection.c +22/-0
lib/pg/basic_type_map_for_queries.rb +8/-4
lib/pg/basic_type_registry.rb +5/-1
lib/pg/connection.rb +41/-32
lib/pg/version.rb +1/-1
DIFFERENT extra_rdoc_files:
1.5.5->1.5.6:
* Changed:
History.md +8/-0
ext/pg_connection.c +22/-0
lib/pg/basic_type_map_for_queries.rb +8/-4
lib/pg/basic_type_registry.rb +5/-1
lib/pg/connection.rb +41/-32
lib/pg/version.rb +1/-1 |
gem compare --diff pg 1.5.5 1.5.6Compared versions: ["1.5.5", "1.5.6"]
DIFFERENT files:
1.5.5->1.5.6:
* Added:
certs/larskanis-2024.pem
--- /tmp/20240304-2000-mhzo2m 2024-03-04 03:53:37.362912095 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/certs/larskanis-2024.pem 2024-03-04 03:53:37.350912075 +0000
@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEBDCCAmygAwIBAgIBAzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNDAyMjgxOTMxNDdaFw0yNTAy
+MjcxOTMxNDdaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR
+7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEArBmHSfnUyNWf3R1Fx0mMHloWGdcKn2D2
+BsqTApXU2nADiyppIqRq4b9e7hw342uzadSLkoQcEFOxThLRhAcijoWfQVBcsbV/
+ZsCY1qlUTIJuSWxaSyS4efUX+N4eMNyPM9oW/sphlWFo0DgI34Y9WB6HDzH+O71y
+R7PARke3f4kYnRJf5yRQLPDrH9UYt9KlBQm6l7XMtr5EMnQt0EfcmZEi9H4t/vS2
+haxvpFMdAKo4H46GBYNO96r6b74t++vgQSBTg/AFVwvRZwNSrPPcBfb4xxeEAhRR
+x+LU7feIH7lZ//3buiyD03gLAEtHXai0Y+/VfuWIpwYJAl2BO/tU7FS/dtbJq9oc
+dI36Yyzy+BrCM0WT4oCsagePNb97FaNhl4F6sM5JEPT0ZPxRx0i3G4TNNIYziVos
+5wFER6XhvvLDFAMh/jMg+s7Wd5SbSHgHNSUaUGVtdWkVPOer6oF0aLdZUR3CETkn
+5nWXZma/BUd3YgYA/Xumc6QQqIS4p7mr
+-----END CERTIFICATE-----
* Changed:
Gemfile
--- /tmp/d20240304-2000-p7s28e/pg-1.5.5/Gemfile 2024-03-04 03:53:37.326912033 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/Gemfile 2024-03-04 03:53:37.346912068 +0000
@@ -13,0 +14,3 @@
+ # "bigdecimal" is a gem on ruby-3.4+ and it's optional for ruby-pg.
+ # Specs should succeed without it, but 4 examples are then excluded.
+ # gem "bigdecimal", "~> 3.0"
History.md
--- /tmp/d20240304-2000-p7s28e/pg-1.5.5/History.md 2024-03-04 03:53:37.326912033 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/History.md 2024-03-04 03:53:37.346912068 +0000
@@ -0,0 +1,8 @@
+## v1.5.6 [2024-03-01] Lars Kanis <[email protected]>
+
+- Renew address resolution (DNS) in conn.reset. [#558](https://github.com/ged/ruby-pg/pull/558)
+ This is important, if DNS is used for load balancing, etc.
+- Make bigdecimal an optional dependency. [#556](https://github.com/ged/ruby-pg/pull/556)
+ It's a gem in ruby-3.4+, so that users shouldn't be forced to use it.
+
+
ext/pg_connection.c
--- /tmp/d20240304-2000-p7s28e/pg-1.5.5/ext/pg_connection.c 2024-03-04 03:53:37.334912047 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/ext/pg_connection.c 2024-03-04 03:53:37.350912075 +0000
@@ -565,0 +566,21 @@
+static VALUE
+pgconn_reset_start2( VALUE self, VALUE conninfo )
+{
+ t_pg_connection *this = pg_get_connection( self );
+
+ /* Close old connection */
+ pgconn_close_socket_io( self );
+ PQfinish( this->pgconn );
+
+ /* Start new connection */
+ this->pgconn = gvl_PQconnectStart( StringValueCStr(conninfo) );
+
+ if( this->pgconn == NULL )
+ rb_raise(rb_ePGerror, "PQconnectStart() unable to allocate PGconn structure");
+
+ if ( PQstatus(this->pgconn) == CONNECTION_BAD )
+ pg_raise_conn_error( rb_eConnectionBad, self, "%s", PQerrorMessage(this->pgconn));
+
+ return Qnil;
+}
+
@@ -4470,0 +4492 @@
+ rb_define_private_method(rb_cPGconn, "reset_start2", pgconn_reset_start2, 1);
lib/pg/basic_type_map_for_queries.rb
--- /tmp/d20240304-2000-p7s28e/pg-1.5.5/lib/pg/basic_type_map_for_queries.rb 2024-03-04 03:53:37.338912054 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/lib/pg/basic_type_map_for_queries.rb 2024-03-04 03:53:37.354912082 +0000
@@ -168,0 +169,6 @@
+ begin
+ require "bigdecimal"
+ has_bigdecimal = true
+ rescue LoadError
+ end
+
@@ -176 +181,0 @@
- BigDecimal => [0, 'numeric'],
@@ -184 +189 @@
- })
+ }.merge(has_bigdecimal ? {BigDecimal => [0, 'numeric']} : {}))
@@ -193 +197,0 @@
- BigDecimal => [0, '_numeric'],
@@ -196 +200 @@
- })
+ }.merge(has_bigdecimal ? {BigDecimal => [0, '_numeric']} : {}))
lib/pg/basic_type_registry.rb
--- /tmp/d20240304-2000-p7s28e/pg-1.5.5/lib/pg/basic_type_registry.rb 2024-03-04 03:53:37.338912054 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/lib/pg/basic_type_registry.rb 2024-03-04 03:53:37.354912082 +0000
@@ -228 +228,5 @@
- register_type 0, 'numeric', PG::TextEncoder::Numeric, PG::TextDecoder::Numeric
+ begin
+ require "bigdecimal"
+ register_type 0, 'numeric', PG::TextEncoder::Numeric, PG::TextDecoder::Numeric
+ rescue LoadError
+ end
lib/pg/connection.rb
--- /tmp/d20240304-2000-p7s28e/pg-1.5.5/lib/pg/connection.rb 2024-03-04 03:53:37.338912054 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/lib/pg/connection.rb 2024-03-04 03:53:37.358912089 +0000
@@ -568 +568,6 @@
- reset_start
+ iopts = conninfo_hash.compact
+ if iopts[:host] && !iopts[:host].empty? && PG.library_version >= 100000
+ iopts = self.class.send(:resolve_hosts, iopts)
+ end
+ conninfo = self.class.parse_connect_args( iopts );
+ reset_start2(conninfo)
@@ -775,0 +781,34 @@
+ # Resolve DNS in Ruby to avoid blocking state while connecting.
+ # Multiple comma-separated values are generated, if the hostname resolves to both IPv4 and IPv6 addresses.
+ # This requires PostgreSQL-10+, so no DNS resolving is done on earlier versions.
+ private def resolve_hosts(iopts)
+ ihosts = iopts[:host].split(",", -1)
+ iports = iopts[:port].split(",", -1)
+ iports = [nil] if iports.size == 0
+ iports = iports * ihosts.size if iports.size == 1
+ raise PG::ConnectionBad, "could not match #{iports.size} port numbers to #{ihosts.size} hosts" if iports.size != ihosts.size
+
+ dests = ihosts.each_with_index.flat_map do |mhost, idx|
+ unless host_is_named_pipe?(mhost)
+ if Fiber.respond_to?(:scheduler) &&
+ Fiber.scheduler &&
+ RUBY_VERSION < '3.1.'
+
+ # Use a second thread to avoid blocking of the scheduler.
+ # `TCPSocket.gethostbyname` isn't fiber aware before ruby-3.1.
+ hostaddrs = Thread.new{ Addrinfo.getaddrinfo(mhost, nil, nil, :STREAM).map(&:ip_address) rescue [''] }.value
+ else
+ hostaddrs = Addrinfo.getaddrinfo(mhost, nil, nil, :STREAM).map(&:ip_address) rescue ['']
+ end
+ else
+ # No hostname to resolve (UnixSocket)
+ hostaddrs = [nil]
+ end
+ hostaddrs.map { |hostaddr| [hostaddr, mhost, iports[idx]] }
+ end
+ iopts.merge(
+ hostaddr: dests.map{|d| d[0] }.join(","),
+ host: dests.map{|d| d[1] }.join(","),
+ port: dests.map{|d| d[2] }.join(","))
+ end
+
@@ -785,31 +824 @@
- # Resolve DNS in Ruby to avoid blocking state while connecting.
- # Multiple comma-separated values are generated, if the hostname resolves to both IPv4 and IPv6 addresses.
- # This requires PostgreSQL-10+, so no DNS resolving is done on earlier versions.
- ihosts = iopts[:host].split(",", -1)
- iports = iopts[:port].split(",", -1)
- iports = [nil] if iports.size == 0
- iports = iports * ihosts.size if iports.size == 1
- raise PG::ConnectionBad, "could not match #{iports.size} port numbers to #{ihosts.size} hosts" if iports.size != ihosts.size
-
- dests = ihosts.each_with_index.flat_map do |mhost, idx|
- unless host_is_named_pipe?(mhost)
- if Fiber.respond_to?(:scheduler) &&
- Fiber.scheduler &&
- RUBY_VERSION < '3.1.'
-
- # Use a second thread to avoid blocking of the scheduler.
- # `TCPSocket.gethostbyname` isn't fiber aware before ruby-3.1.
- hostaddrs = Thread.new{ Addrinfo.getaddrinfo(mhost, nil, nil, :STREAM).map(&:ip_address) rescue [''] }.value
- else
- hostaddrs = Addrinfo.getaddrinfo(mhost, nil, nil, :STREAM).map(&:ip_address) rescue ['']
- end
- else
- # No hostname to resolve (UnixSocket)
- hostaddrs = [nil]
- end
- hostaddrs.map { |hostaddr| [hostaddr, mhost, iports[idx]] }
- end
- iopts.merge!(
- hostaddr: dests.map{|d| d[0] }.join(","),
- host: dests.map{|d| d[1] }.join(","),
- port: dests.map{|d| d[2] }.join(","))
+ iopts = resolve_hosts(iopts)
lib/pg/version.rb
--- /tmp/d20240304-2000-p7s28e/pg-1.5.5/lib/pg/version.rb 2024-03-04 03:53:37.338912054 +0000
+++ /tmp/d20240304-2000-p7s28e/pg-1.5.6/lib/pg/version.rb 2024-03-04 03:53:37.358912089 +0000
@@ -3 +3 @@
- VERSION = '1.5.5'
+ VERSION = '1.5.6' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps pg from 1.5.5 to 1.5.6.
Changelog
Sourced from pg's changelog.
Commits
c59ca8fAdd renewed certificate for x509 signature of gem releasescaf11baBump VERSION to 1.5.691cdac8Add release notes for pg-1.5.627d7c2aMerge pull request #559 from larskanis/reset-with-dns016c17clibpq resolves the host address while PQreset, but ruby-pg doesn't. This is b...21ca5ccMerge pull request #556 from larskanis/optional-bigdecimal5804665Make bigdecimal an optional dependencyDependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot mergewill merge this PR after your CI passes on it@dependabot squash and mergewill squash and merge this PR after your CI passes on it@dependabot cancel mergewill cancel a previously requested merge and block automerging@dependabot reopenwill reopen this PR if it is closed@dependabot closewill close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)